name: pre-commit run_id: commands[2] env HOME: /home/jenkins env LANG: C.UTF-8 env OLM_TIMER1: 3000 env OLM_TIMER2: 2000 env PATH: /w/workspace/transportpce-tox-verify-transportpce-master/.tox/pre-commit/bin:/opt/pyenv/bin:/tmp/venv-rI5M/bin:/opt/pyenv/shims:/home/jenkins/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/opt/puppetlabs/bin env PIP_DISABLE_PIP_VERSION_CHECK: 1 env PYTHONHASHSEED: 1268549865 env PYTHONIOENCODING: utf-8 env SSH_AUTH_SOCK: ******************************** env TOX_ENV_DIR: /w/workspace/transportpce-tox-verify-transportpce-master/.tox/pre-commit env TOX_ENV_NAME: pre-commit env TOX_WORK_DIR: /w/workspace/transportpce-tox-verify-transportpce-master/.tox env VIRTUAL_ENV: /w/workspace/transportpce-tox-verify-transportpce-master/.tox/pre-commit env __TOX_ENVIRONMENT_VARIABLE_ORIGINAL_CI: true metadata pid: 2478 cwd: /w/workspace/transportpce-tox-verify-transportpce-master/tests allow: /w/workspace/transportpce-tox-verify-transportpce-master/.tox/pre-commit/bin/*:sh:cpan:sudo:which:fixCIcentOS8reposMirrors.sh cmd: pre-commit run --all-files --show-diff-on-failure exit_code: 1 [WARNING] hook id `remove-tabs` uses deprecated stage names (commit) which will be removed in a future version. run: `pre-commit migrate-config` to automatically fix this. [WARNING] hook id `perltidy` uses deprecated stage names (commit) which will be removed in a future version. run: `pre-commit migrate-config` to automatically fix this. [INFO] Initializing environment for https://github.com/pre-commit/pre-commit-hooks. [WARNING] repo `https://github.com/pre-commit/pre-commit-hooks` uses deprecated stage names (commit, push) which will be removed in a future version. Hint: often `pre-commit autoupdate --repo https://github.com/pre-commit/pre-commit-hooks` will fix this. if it does not -- consider reporting an issue to that repo. [INFO] Initializing environment for https://github.com/jorisroovers/gitlint. [INFO] Initializing environment for https://github.com/jorisroovers/gitlint:./gitlint-core[trusted-deps]. [INFO] Initializing environment for https://github.com/Lucas-C/pre-commit-hooks. [INFO] Initializing environment for https://github.com/pre-commit/mirrors-autopep8. [INFO] Initializing environment for https://github.com/perltidy/perltidy. [INFO] Installing environment for https://github.com/pre-commit/pre-commit-hooks. [INFO] Once installed this environment will be reused. [INFO] This may take a few minutes... [INFO] Installing environment for https://github.com/Lucas-C/pre-commit-hooks. [INFO] Once installed this environment will be reused. [INFO] This may take a few minutes... [INFO] Installing environment for https://github.com/pre-commit/mirrors-autopep8. [INFO] Once installed this environment will be reused. [INFO] This may take a few minutes... [INFO] Installing environment for https://github.com/perltidy/perltidy. [INFO] Once installed this environment will be reused. [INFO] This may take a few minutes... trim trailing whitespace.................................................Passed Tabs remover.............................................................Passed autopep8.................................................................Failed - hook id: autopep8 - files were modified by this hook perltidy.................................................................Passed pre-commit hook(s) made changes. If you are seeing this message in CI, reproduce locally with: `pre-commit run --all-files`. To run `pre-commit` as part of git workflow, use `pre-commit install`. All changes made by hooks: diff --git a/tests/transportpce_tests/common/test_utils_generate_tapi_topo.py b/tests/transportpce_tests/common/test_utils_generate_tapi_topo.py index 0a08d645f..8ea6ee5fc 100644 --- a/tests/transportpce_tests/common/test_utils_generate_tapi_topo.py +++ b/tests/transportpce_tests/common/test_utils_generate_tapi_topo.py @@ -349,6 +349,7 @@ def cleanup_and_disconnect_devices(): disconnect_xpdrA_C() disconnect_spdrA_C() + def disconnect_spdrA_C(): response = test_utils.unmount_device("SPDR-SA1") if response.status_code not in [204]: diff --git a/tests/transportpce_tests/tapi/test05_pce_tapi.py b/tests/transportpce_tests/tapi/test05_pce_tapi.py index d66118203..113925801 100644 --- a/tests/transportpce_tests/tapi/test05_pce_tapi.py +++ b/tests/transportpce_tests/tapi/test05_pce_tapi.py @@ -400,10 +400,8 @@ class TransportPCEtest(unittest.TestCase): def test_03_create_connectivity_service_PhotonicMedia(self): # Service creation from SIP of SPDR-SA1-XPDR2-NETWORK1 to SIP of of SPDR-SC1-XPDR2-NETWORK1 - self.cr_serv_input_data["end-point"][0]["service-interface-point"]\ - ["service-interface-point-uuid"] = self.sAX2OTS1 - self.cr_serv_input_data["end-point"][1]["service-interface-point"]\ - ["service-interface-point-uuid"] = self.sZX2OTS1 + self.cr_serv_input_data["end-point"][0]["service-interface-point"]["service-interface-point-uuid"] = self.sAX2OTS1 + self.cr_serv_input_data["end-point"][1]["service-interface-point"]["service-interface-point-uuid"] = self.sZX2OTS1 response = test_utils.transportpce_api_rpc_request( 'tapi-connectivity', 'create-connectivity-service', self.cr_serv_input_data) time.sleep(self.WAITING) @@ -481,13 +479,11 @@ class TransportPCEtest(unittest.TestCase): self.cr_serv_input_data["layer-protocol-name"] = "DIGITAL_OTN" self.cr_serv_input_data["name"][0]["value"] = "serviceOdu4-1" self.cr_serv_input_data["end-point"][0]["layer-protocol-name"] = "DIGITAL_OTN" - self.cr_serv_input_data["end-point"][0]["service-interface-point"]\ - ["service-interface-point-uuid"] = self.sAX2iODU1 + self.cr_serv_input_data["end-point"][0]["service-interface-point"]["service-interface-point-uuid"] = self.sAX2iODU1 self.cr_serv_input_data["end-point"][0]["connection-end-point"][0]["node-edge-point-uuid"] = self.nAX2iODU1 self.cr_serv_input_data["end-point"][0]["connection-end-point"][0]["connection-end-point-uuid"] = self.nAX2iODU1 self.cr_serv_input_data["end-point"][1]["layer-protocol-name"] = "DIGITAL_OTN" - self.cr_serv_input_data["end-point"][1]["service-interface-point"]\ - ["service-interface-point-uuid"] = self.sZX2iODU1 + self.cr_serv_input_data["end-point"][1]["service-interface-point"]["service-interface-point-uuid"] = self.sZX2iODU1 self.cr_serv_input_data["end-point"][1]["connection-end-point"][0]["node-edge-point-uuid"] = self.nZX2iODU1 self.cr_serv_input_data["end-point"][1]["connection-end-point"][0]["connection-end-point-uuid"] = self.nZX2iODU1 response = test_utils.transportpce_api_rpc_request( @@ -624,16 +620,14 @@ class TransportPCEtest(unittest.TestCase): self.cr_serv_input_data["layer-protocol-name"] = "PHOTONIC_MEDIA" self.cr_serv_input_data["name"][0]["value"] = "servicephotonic-2" self.cr_serv_input_data["end-point"][0]["layer-protocol-name"] = "PHOTONIC_MEDIA" - self.cr_serv_input_data["end-point"][0]["service-interface-point"]\ - ["service-interface-point-uuid"] = self.sAX1OTS1 + self.cr_serv_input_data["end-point"][0]["service-interface-point"]["service-interface-point-uuid"] = self.sAX1OTS1 self.cr_serv_input_data["end-point"][0]["connection-end-point"][0]["node-uuid"] = self.s1Auuid self.cr_serv_input_data["end-point"][0]["connection-end-point"][0]["node-edge-point-uuid"] = self.nAX1OTS1 self.cr_serv_input_data["end-point"][0]["connection-end-point"][0]["connection-end-point-uuid"] = self.nAX1OTS1 self.cr_serv_input_data["end-point"][0]["local-id"] = "SPDR-SA1-XPDR1" self.cr_serv_input_data["end-point"][0]["name"][0]["value"] = "SPDR-SA1-XPDR1" self.cr_serv_input_data["end-point"][1]["layer-protocol-name"] = "PHOTONIC_MEDIA" - self.cr_serv_input_data["end-point"][1]["service-interface-point"]\ - ["service-interface-point-uuid"] = self.sZX1OTS1 + self.cr_serv_input_data["end-point"][1]["service-interface-point"]["service-interface-point-uuid"] = self.sZX1OTS1 self.cr_serv_input_data["end-point"][1]["connection-end-point"][0]["node-uuid"] = self.s1Cuuid self.cr_serv_input_data["end-point"][1]["connection-end-point"][0]["node-edge-point-uuid"] = self.nZX1OTS1 self.cr_serv_input_data["end-point"][1]["connection-end-point"][0]["connection-end-point-uuid"] = self.nZX1OTS1 @@ -711,13 +705,11 @@ class TransportPCEtest(unittest.TestCase): self.cr_serv_input_data["layer-protocol-name"] = "DIGITAL_OTN" self.cr_serv_input_data["name"][0]["value"] = "serviceOdu4-2" self.cr_serv_input_data["end-point"][0]["layer-protocol-name"] = "DIGITAL_OTN" - self.cr_serv_input_data["end-point"][0]["service-interface-point"]\ - ["service-interface-point-uuid"] = self.sAX1iODU1 + self.cr_serv_input_data["end-point"][0]["service-interface-point"]["service-interface-point-uuid"] = self.sAX1iODU1 self.cr_serv_input_data["end-point"][0]["connection-end-point"][0]["node-edge-point-uuid"] = self.nAX1iODU1 self.cr_serv_input_data["end-point"][0]["connection-end-point"][0]["connection-end-point-uuid"] = self.nAX1iODU1 self.cr_serv_input_data["end-point"][1]["layer-protocol-name"] = "DIGITAL_OTN" - self.cr_serv_input_data["end-point"][1]["service-interface-point"]\ - ["service-interface-point-uuid"] = self.sZX1iODU1 + self.cr_serv_input_data["end-point"][1]["service-interface-point"]["service-interface-point-uuid"] = self.sZX1iODU1 self.cr_serv_input_data["end-point"][1]["connection-end-point"][0]["node-edge-point-uuid"] = self.nZX1iODU1 self.cr_serv_input_data["end-point"][1]["connection-end-point"][0]["connection-end-point-uuid"] = self.nZX1iODU1 response = test_utils.transportpce_api_rpc_request( @@ -800,16 +792,14 @@ class TransportPCEtest(unittest.TestCase): self.cr_serv_input_data["layer-protocol-name"] = "PHOTONIC_MEDIA" self.cr_serv_input_data["name"][0]["value"] = "servicephotonic-3" self.cr_serv_input_data["end-point"][0]["layer-protocol-name"] = "PHOTONIC_MEDIA" - self.cr_serv_input_data["end-point"][0]["service-interface-point"]\ - ["service-interface-point-uuid"] = self.sAX3OTS1 + self.cr_serv_input_data["end-point"][0]["service-interface-point"]["service-interface-point-uuid"] = self.sAX3OTS1 self.cr_serv_input_data["end-point"][0]["connection-end-point"][0]["node-uuid"] = self.s3Auuid self.cr_serv_input_data["end-point"][0]["connection-end-point"][0]["node-edge-point-uuid"] = self.nAX3OTS1 self.cr_serv_input_data["end-point"][0]["connection-end-point"][0]["connection-end-point-uuid"] = self.nAX3OTS1 self.cr_serv_input_data["end-point"][0]["local-id"] = "SPDR-SA1-XPDR3" self.cr_serv_input_data["end-point"][0]["name"][0]["value"] = "SPDR-SA1-XPDR3" self.cr_serv_input_data["end-point"][1]["layer-protocol-name"] = "PHOTONIC_MEDIA" - self.cr_serv_input_data["end-point"][1]["service-interface-point"]\ - ["service-interface-point-uuid"] = self.sZX3OTS1 + self.cr_serv_input_data["end-point"][1]["service-interface-point"]["service-interface-point-uuid"] = self.sZX3OTS1 self.cr_serv_input_data["end-point"][1]["connection-end-point"][0]["node-uuid"] = self.s3Cuuid self.cr_serv_input_data["end-point"][1]["connection-end-point"][0]["node-edge-point-uuid"] = self.nZX3OTS1 self.cr_serv_input_data["end-point"][1]["connection-end-point"][0]["connection-end-point-uuid"] = self.nZX3OTS1 @@ -852,13 +842,11 @@ class TransportPCEtest(unittest.TestCase): self.cr_serv_input_data["layer-protocol-name"] = "DIGITAL_OTN" self.cr_serv_input_data["name"][0]["value"] = "serviceOdu4-3" self.cr_serv_input_data["end-point"][0]["layer-protocol-name"] = "DIGITAL_OTN" - self.cr_serv_input_data["end-point"][0]["service-interface-point"]\ - ["service-interface-point-uuid"] = self.sAX3iODU1 + self.cr_serv_input_data["end-point"][0]["service-interface-point"]["service-interface-point-uuid"] = self.sAX3iODU1 self.cr_serv_input_data["end-point"][0]["connection-end-point"][0]["node-edge-point-uuid"] = self.nAX3iODU1 self.cr_serv_input_data["end-point"][0]["connection-end-point"][0]["connection-end-point-uuid"] = self.nAX3iODU1 self.cr_serv_input_data["end-point"][1]["layer-protocol-name"] = "DIGITAL_OTN" - self.cr_serv_input_data["end-point"][1]["service-interface-point"]\ - ["service-interface-point-uuid"] = self.sZX3iODU1 + self.cr_serv_input_data["end-point"][1]["service-interface-point"]["service-interface-point-uuid"] = self.sZX3iODU1 self.cr_serv_input_data["end-point"][1]["connection-end-point"][0]["node-edge-point-uuid"] = self.nZX3iODU1 self.cr_serv_input_data["end-point"][1]["connection-end-point"][0]["connection-end-point-uuid"] = self.nZX3iODU1 response = test_utils.transportpce_api_rpc_request( @@ -981,7 +969,7 @@ class TransportPCEtest(unittest.TestCase): res_found_in_ztoa = True break if ('node-id' in ztoaElt['resource'].keys() and ztoaElt['resource']['node-id'] == resourceToFind - and ztoaElt['resource']['state'] == 'inService'): + and ztoaElt['resource']['state'] == 'inService'): res_found_in_ztoa = True break if res_found_in_atoz and res_found_in_ztoa: